5424130db083fcd3e2d01535e7eab279ccd69a3b,opennms-webapp/src/main/java/org/opennms/web/controller/ksc/CustomViewController.java,CustomViewController,handleRequestInternal,#HttpServletRequest#HttpServletResponse#,70

Before Change


            Graph current_graph = report.getGraph(i);
            
            OnmsResource resource = getKscReportService().getResourceFromGraph(current_graph);
            getResourceService().promoteGraphAttributesForResource(resource);

            String display_graphtype = null;
            if ("none".equals(override_graphtype)) {

After Change


        }
        
        
        Map<String, OnmsResource> resourcesBeingGraphed = new HashMap<String, OnmsResource>();
        
        ArrayList<KscResultSet> resultSets = new ArrayList<KscResultSet>(report.getGraphCount());
        for (int i = 0; i < report.getGraphCount(); i++) {
            Graph current_graph = report.getGraph(i);
            
            OnmsResource resource = getKscReportService().getResourceFromGraph(current_graph);
            resourcesBeingGraphed.put(resource.getId(), resource);

            String display_graphtype = null;
            if ("none".equals(override_graphtype)) {
                display_graphtype = current_graph.getGraphtype();
            } else {
                display_graphtype = override_graphtype;
            }
            
            PrefabGraph display_graph = getResourceService().getPrefabGraph(display_graphtype);
            
            // gather start/stop time information
            String display_timespan = null;
            if ("none".equals(override_timespan)) {
                display_timespan = current_graph.getTimespan();
            } else {
                display_timespan = override_timespan;
            }
            Calendar begin_time = Calendar.getInstance();
            Calendar end_time = Calendar.getInstance();
            KSC_PerformanceReportFactory.getBeginEndTime(display_timespan, begin_time, end_time);
            
            KscResultSet resultSet = new KscResultSet(current_graph.getTitle(), begin_time.getTime(), end_time.getTime(), resource, display_graph);
            resultSets.add(resultSet);
        }
        
        for(String resourceId : resourcesBeingGraphed.keySet()) {
            OnmsResource resource = resourcesBeingGraphed.get(resourceId);
            getResourceService().promoteGraphAttributesForResource(resource);
        }

        ModelAndView modelAndView = new ModelAndView("KSC/customView");